From: Andres Lagar-Cavilla Date: Thu, 19 Jan 2012 10:42:42 +0000 (+0000) Subject: x86/mm: Don't ASSERT() for a valid mfn on paged p2m entries in guest_physmap_ad X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~9225 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=9c5f0457b2fff90b5004b5fdca2c620ca7904e5f;p=xen.git x86/mm: Don't ASSERT() for a valid mfn on paged p2m entries in guest_physmap_ad Signed-off-by: Adin Scannell Signed-off-by: Andres Lagar-Cavilla Acked-by: Tim Deegan Committed-by: Tim Deegan --- diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 91851bb883..4a0ca8bb73 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -489,7 +489,7 @@ guest_physmap_add_entry(struct domain *d, unsigned long gfn, return -EINVAL; } - else if ( p2m_is_ram(ot) ) + else if ( p2m_is_ram(ot) && !p2m_is_paged(ot) ) { ASSERT(mfn_valid(omfn)); set_gpfn_from_mfn(mfn_x(omfn), INVALID_M2P_ENTRY); @@ -514,7 +514,7 @@ guest_physmap_add_entry(struct domain *d, unsigned long gfn, P2M_DEBUG("aliased! mfn=%#lx, old gfn=%#lx, new gfn=%#lx\n", mfn + i, ogfn, gfn + i); omfn = p2m->get_entry(p2m, ogfn, &ot, &a, p2m_query, NULL); - if ( p2m_is_ram(ot) ) + if ( p2m_is_ram(ot) && !p2m_is_paged(ot) ) { ASSERT(mfn_valid(omfn)); P2M_DEBUG("old gfn=%#lx -> mfn %#lx\n",